Update...I cleaned the MAF and TPS. I then disconnected the positive on the battery for about an hour to reset the ecm. After plugging it back in, the idle is definitely more stable. But now the idle stays about 1300 rpm for a minute or so before declining to ~900 rpm. It stays around 900 rpm but I know that is high. It also has a slight intermittent backfire at idle (sort of a quiet pop) that I need to address. I have not taken it for a test drive again to see about the hesitation with acceleration.